From 99836c65280dfeff25dc4aa814faa9865d3aeac1 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 7 Jul 2008 02:45:51 +0000 Subject: [PATCH] Don't blindly chain up in the buildable implementation. Reported by Kevin * gtk/gtkcellview.c: Don't blindly chain up in the buildable implementation. Reported by Kevin Ryde. svn path=/trunk/; revision=20802 --- ChangeLog | 8 ++++++++ gtk/gtkcellview.c | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8bceb019e8..d1a28ac5eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-07-06 Matthias Clasen + + Bug 528845 – segv from GtkBuilder on attempting under + GtkCellView + + * gtk/gtkcellview.c: Don't blindly chain up in the buildable + implementation. Reported by Kevin Ryde. + 2008-07-06 Matthias Clasen Bug 469068 – clarify gdk_cairo_create() diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c index dab19cb8d0..e5350a526a 100644 --- a/gtk/gtkcellview.c +++ b/gtk/gtkcellview.c @@ -1086,7 +1086,8 @@ gtk_cell_view_buildable_custom_tag_start (GtkBuildable *buildable, GMarkupParser *parser, gpointer *data) { - if (parent_buildable_iface->custom_tag_start (buildable, builder, child, + if (parent_buildable_iface->custom_tag_start && + parent_buildable_iface->custom_tag_start (buildable, builder, child, tagname, parser, data)) return TRUE; @@ -1104,7 +1105,7 @@ gtk_cell_view_buildable_custom_tag_end (GtkBuildable *buildable, if (strcmp (tagname, "attributes") == 0) _gtk_cell_layout_buildable_custom_tag_end (buildable, builder, child, tagname, data); - else + else if (parent_buildable_iface->custom_tag_end) parent_buildable_iface->custom_tag_end (buildable, builder, child, tagname, data); } -- 2.30.2